From 19b3f692d16b53a8545817663065c18e4cb03e6e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 26 May 2019 22:37:56 -0400
Subject: [PATCH] separator: Make final

---
 gtk/gtkseparator.c | 11 +++++++++++
 gtk/gtkseparator.h | 24 +-----------------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index c6acab5da7..16cde5d510 100644
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -46,6 +46,17 @@
  * gets one of the .horizontal or .vertical style classes.
  */
 
+typedef struct _GtkSeparatorClass         GtkSeparatorClass;
+
+struct _GtkSeparator
+{
+  GtkWidget parent_instance;
+};
+
+struct _GtkSeparatorClass
+{
+  GtkWidgetClass parent_class;
+};
 
 typedef struct _GtkSeparatorPrivate GtkSeparatorPrivate;
 struct _GtkSeparatorPrivate
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index 1f129c8d0a..cdc91ecf6c 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -37,31 +37,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_SEPARATOR                  (gtk_separator_get_type ())
 #define GTK_SEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR, GtkSeparator))
-#define GTK_SEPARATOR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
 #define GTK_IS_SEPARATOR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEPARATOR))
-#define GTK_IS_SEPARATOR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR))
-#define GTK_SEPARATOR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
-
-
-typedef struct _GtkSeparator              GtkSeparator;
-typedef struct _GtkSeparatorClass         GtkSeparatorClass;
-
-struct _GtkSeparator
-{
-  GtkWidget parent_instance;
-};
-
-struct _GtkSeparatorClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
 
+typedef struct _GtkSeparator GtkSeparator;
 
 GDK_AVAILABLE_IN_ALL
 GType       gtk_separator_get_type (void) G_GNUC_CONST;
-- 
2.30.2